fix: fix shell generation panic due to unnecessary 'conflicts_with' #2934
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
t-nelson
reviewed
Oct 15, 2024
| @@ -278,7 +278,6 @@ impl ProgramV4SubCommands for App<'_, '_> { | |||
| Arg::with_name("all") | |||
| .long("all") | |||
| .conflicts_with("account") | |||
| .conflicts_with("buffer_authority") | |||
There was a problem hiding this comment.
@pgarg66 it's supposed to be .conflicts_with("authority"), right?
There was a problem hiding this comment.
Shall I push up that change so we can merge this? May as well fix this
There was a problem hiding this comment.
That's correct. It should've been the authority. Likely a copy-paste error from program.rs.
Thanks for catching it.
ray-kast
pushed a commit
to abklabs/agave
that referenced
this pull request
Nov 27, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem
solana completions -s zshcurrently panics when trying to generate zsh completions.The root cause is the below code which defines a conflicting arg
buffer_authorityforsolana program-v4 show, howeverbuffer_authorityis not an argument inprogram-v4 show:agave/cli/src/program_v4.rs
Lines 277 to 283 in fc0183d
This results in clap panicking due to
find_any_argreturningNone, but the calling macro usesexpect()https://github.com/clap-rs/clap/blob/v2.33.3/src/completions/macros.rs#L15
https://github.com/clap-rs/clap/blob/v2.33.3/src/app/parser.rs#L2168-L2179
Summary of Changes
.conflicts_with("buffer_authority")with.conflicts_with("authority")inprogram-v4 showFixes #2929